spl: atf: Fix uninitialized pointer to bl31_image_info

The pointer to struct atf_image_info in
bl31_params_mem.bl31_params.bl31_image_info is not initialized before
being dereferenced. This can cause U-Boot to crash right before jumping
to the BL31 ATF binary.

Signed-off-by: Frieder Schrempf <[email protected]>
Fixes: bcc1726a7bdd ("spl: add support to booting with ATF")
Reviewed-by: Kever Yang <[email protected]>

diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c
index cddab6a73584e3565c2c8a177160fb1351418065..4715f9d3719faced434616c5bd651563cf6be2f9 100644 (file)
--- a/common/spl/spl_atf.c
+++ b/common/spl/spl_atf.c
@@ -45,6 +45,7 @@ static struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl33_entry)
        SET_PARAM_HEAD(bl2_to_bl31_params, ATF_PARAM_BL31, ATF_VERSION_1, 0);
 
        /* Fill BL31 related information */
+       bl2_to_bl31_params->bl31_image_info = &bl31_params_mem.bl31_image_info;
        SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info,
                       ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0);